tree e418d7b37688a36e17ea55bed225d1b4e837e2e1
parent cff8c3e3f871c86b0db79c00c1c20dfc86f4eae3
parent 168d9e1c143fafd2427987d9762657400fda7246
author Xin Li <delphij@google.com> 1572471844 -0700
committer android-build-merger <android-build-merger@google.com> 1572471844 -0700

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

Change-Id: I0b3e2a530b390715bb53e5597619d2c662bfcc1c