tree 6187e24df2a72b7e06c0c0662429588f73442f83
parent 954ba122836e1f6209874b89371c700d20744100
parent ba5d32995c192b4b9c80e11147dc98eb770c33b6
author Xin Li <delphij@google.com> 1572469185 -0700
committer android-build-merger <android-build-merger@google.com> 1572469185 -0700

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

Change-Id: Ia8e5765654c73b23298662b5186b2df9e2e12f6f