tree 7f7571a134d11528cf5afb70efd16a6b1cf77db8
parent 51dd8b27ed2b93ab5945c6b192e212181e142c28
parent 3e4f06d9f918c9ef5e65b56e04dc7f2f353b3a35
author Xin Li <delphij@google.com> 1572473391 -0700
committer android-build-merger <android-build-merger@google.com> 1572473391 -0700

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

Change-Id: I5dda3f9b876bb285428c92a84a40e7e1dc0d3a17