tree 94c17e8d05625433aa0fe2ef9bc3d15afa422971
parent 7d8e66235d3a5cf7cc91797188e0dda63295288e
parent 4beb4e3ca353e5b3445bddf31e8158487c22204d
author Xin Li <delphij@google.com> 1572461325 -0700
committer Xin Li <delphij@google.com> 1572461325 -0700

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

Bug: 142003500
Change-Id: If193fbebeeb3de2a166a1e738cd0a895d0effea7