tree cd524d1c44ed5ba56e86e6ff9a0fbf7505cc0160
parent bc6f9b3bd41d1e3b2be0c5710857579982ee725b
parent eeaf88354ff22ff67f82a9cdc0fda4132c8da3a8
author Xin Li <delphij@google.com> 1572473380 -0700
committer android-build-merger <android-build-merger@google.com> 1572473380 -0700

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

Change-Id: If3027a421f9b58bb0689d043222ee16fb2817af0