tree fcc0349353273aa62f307117a83b9f1fdb7bbef0
parent 171d52718eef4532bc7814a468523a55ec6c2e45
parent bab9819b214e77a1e3c36e2dc478d60aa43a6382
author Xin Li <delphij@google.com> 1572475081 -0700
committer android-build-merger <android-build-merger@google.com> 1572475081 -0700

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

Change-Id: I8358d9232bcd14ffb280d394ba1fb30046ee7c77