tree 652735a615f78e8873ccb0884b2a0220aeec6636
parent 3d621cc7e3eabdaee8104ff3e1a559b967a97ccb
parent 447d07451b2e5cfd0f165c8f49f28ba9da66fcdc
author Xin Li <delphij@google.com> 1572470650 -0700
committer android-build-merger <android-build-merger@google.com> 1572470650 -0700

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

Change-Id: Ia11334ef51b48527f31744e44d1a272657a67cef