tree 078dba8803b92c564f54fa60cb4a2b0cc7af3d80
parent 2e24b85f86280607ef588816ff14b08fe8b1a09f
parent 8ae85592a0481bdda1dee994a3f5c6bdbe22b2e6
author Xin Li <delphij@google.com> 1572471701 -0700
committer android-build-merger <android-build-merger@google.com> 1572471701 -0700

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

Change-Id: I86c35c0a3f28989de5948e8870d6fbf32f7e9ffa