tree a5c3e70d0c965d5b0cd9dc2e7a9f881fcd4ac971
parent 70873d90d727ddd389a1ac88fcf598895755e65b
parent 981cac64d22c71f9dab2ffd1a3aee06720896960
author Xin Li <delphij@google.com> 1572476207 -0700
committer android-build-merger <android-build-merger@google.com> 1572476207 -0700

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

Change-Id: Ibb5a50c2359c25cab695edc133676094b4b3268d