tree 5f86ac097e2846edf0e2430b44270148e8716a39
parent f80d7110cefbdda80db3549eae70461af2cd2028
parent 5cbf405c5f6c0675d65e0aeb6aba73387f5db1d9
author Xin Li <delphij@google.com> 1572461321 -0700
committer Xin Li <delphij@google.com> 1572461321 -0700

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

Bug: 142003500
Change-Id: I5a9a0b5d4f9abbced1526f953317829e83614bc4