tree 6187e24df2a72b7e06c0c0662429588f73442f83
parent de9d0ae79e0b03f09741ff666b95520e8245a59c
parent 40335301327f754f205eee4b7b417e21f9c3e118
author Xin Li <delphij@google.com> 1572470611 -0700
committer android-build-merger <android-build-merger@google.com> 1572470611 -0700

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

Change-Id: I5aeff0e176aff0c7160811c87fbee54c60d3b8fe