tree 3a5b26e145f6189bd77e7bf27090cad9404ff208
parent a5c5b39d5b31f391521be3335a7d925f6d5aed27
parent a2cebf686dd9437431d8b611f21db744c9650d0c
author Xin Li <delphij@google.com> 1572478104 -0700
committer android-build-merger <android-build-merger@google.com> 1572478104 -0700

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

Change-Id: I2a2c61a02c6a7d8a18812d7812252f4cfde0b8b0