tree d36ba7c6a583c2a0f5b2526adea25358d8dc585e
parent 8f29f4e0b3919b551a0210afc8c73b7faed73af0
parent 795803391036f76d99a75bca1924e791d8ee943a
author Xin Li <delphij@google.com> 1572470365 -0700
committer android-build-merger <android-build-merger@google.com> 1572470365 -0700

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

Change-Id: I96f9dc9f73eb54339a2f3cd7d8a68c5c52dc6f05