tree 47b17512d6f1a0484778a80279a06e1bef9a3fac
parent 05a0d9ebb81a8f4a567af5890ba9845e5e5ed0ed
parent 9a29c6bf0d39582a7052c2b2e2c1c87054ab0415
author Xin Li <delphij@google.com> 1584637904 -0700
committer Xin Li <delphij@google.com> 1584637904 -0700

DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master

Bug: 151763422
Change-Id: Ie72b0e772eb11d8c5990c1c83987cb5a659d36ca