tree 2939b610e453fb7a21774f749f7012c29622e940
parent 6be6d32a1e178436180eaaecbf8f524701034ace
parent 78bcfe5b90bdf22ea4b6bcbe30121af123e38aa8
author Xin Li <delphij@google.com> 1572473718 -0700
committer android-build-merger <android-build-merger@google.com> 1572473718 -0700

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

Change-Id: I798984ff3aa4bae44643f42416009bfcc9931bfd