tree 04a81ba53053c150df2562f9fcc4814673ffc020
parent 53d57ec80b57eec054041cf99190a5d5a0b623f2
parent 813aadc6c7ece543af4b8a7207e4e4b403f2d492
author Xin Li <delphij@google.com> 1572471866 -0700
committer android-build-merger <android-build-merger@google.com> 1572471866 -0700

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

Change-Id: I9bb4939d3d9444b65d0d00b705fbd21cf4d6acbe