tree ba13fabed656ca46235102d575b29b7003afd7e0
parent 09ef2a2d1ef76470b0caef4921219e17682884a7
parent a319345a78871c3a972c4c92ca96bdd691053f5b
author Xin Li <delphij@google.com> 1572552766 -0700
committer android-build-merger <android-build-merger@google.com> 1572552766 -0700

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

Change-Id: Ib76ad9436ae0b1998e43a7872de0c0c21e1a4d11