tree e9fb14bd73b8f85c9c77b77ad76e7870a356acf0
parent 5a1e983aa7393f541d214f285737882a7f6846bb
parent ec5fa84d0c78d8038e26c77f334b9a4aecb35d9a
author Xin Li <delphij@google.com> 1572470641 -0700
committer android-build-merger <android-build-merger@google.com> 1572470641 -0700

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

Change-Id: Ic804d9fc2327f7055cdb8fa5585ab1dcce0d98f9