tree b7b9cacbc37ee4dead0497d902f0cc4c232442c8
parent 48c2a666fcf69bb5e406ab579ab2a60362326801
parent 385496803c2652ad5228e54c262052abc6420482
author Xin Li <delphij@google.com> 1572473568 -0700
committer android-build-merger <android-build-merger@google.com> 1572473568 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 298ebabc53
am: 385496803c -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfd946bdd48a7af28e215b0316ff619178914e43