tree bb50b2476df0d3f3cf36c9cbdd2b1983d793f4d9
parent 9116956505e39e92f60c2937069f74bae2213157
parent 766c2204b06d53441bdbc347b104390358f375f1
author Xin Li <delphij@google.com> 1572469204 -0700
committer android-build-merger <android-build-merger@google.com> 1572469204 -0700

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 766c2204b0

Change-Id: I370bf1d309deed8c3810972fcaa09620052382cf