tree cc543caaba450076d4d2e09f7f51122a7a5f0155
parent 4ac7b0ec75ee6c0f520f4483fd1f95af291c1e39
parent c72b929327e09ae6c482ff6d091f191c64044c43
author Xin Li <delphij@google.com> 1572470548 -0700
committer android-build-merger <android-build-merger@google.com> 1572470548 -0700

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

Change-Id: I2ed66755997b4b7d943d9206264db158ee43c460