tree 51312d1ff3f502ade3bd7c049e4329cc3ad54654
parent fc6f73d8b2f738445f122af6829b4021c69e7a74
parent 43189be92de3c1434b6639e70c80957fc53a244d
author Xin Li <delphij@google.com> 1572475020 -0700
committer android-build-merger <android-build-merger@google.com> 1572475020 -0700

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

Change-Id: I74991bf29598fc4ea96ee50cf45dc6640585078b