tree 3d0f6532dde961e17aa921b9a5e76681a0b47fff
parent b8542f454a5c3f7171d64b3276152b5fc7131155
parent 9689100683aa0695bd2ba3c72068473346dfea7b
author Xin Li <delphij@google.com> 1572470645 -0700
committer android-build-merger <android-build-merger@google.com> 1572470645 -0700

[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 335a562129
am: 9689100683 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd03192a4e924d469719377940b5e19c8cdc6b9a