tree a1a984e8c94750699cbb0931b59a6d5890a947f8
parent bd032964e6f8052b68e85313047f7dea970f9f92
parent 5c12f0c675fcf5cdc29e25f69d7bbac34d1c2972
author Xin Li <delphij@google.com> 1572473475 -0700
committer android-build-merger <android-build-merger@google.com> 1572473475 -0700

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

Change-Id: Ib0435eae24f5ae4f5454c8b6e34bf23f87a94036