tree 74ccc78f47c0f5e49729ef26516e4d524ff02833
parent 54cd45bf7402459e87eadece10774869188675e1
parent f7e72735b6077918e283b9f36e3a033a9a9ca498
author Xin Li <delphij@google.com> 1572469231 -0700
committer android-build-merger <android-build-merger@google.com> 1572469231 -0700

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

Change-Id: I7653205fdf2cea6d5c0a73b2181142b6f7bae28f