tree cf30a85e67600fde8f03ec0060b5444f05e4d627
parent 78a8e4ac328d5bd881cc2dd72a8c340c48fa4527
parent d4b612036d09884a6a9eba12a97e665220b90925
author Xin Li <delphij@google.com> 1572474927 -0700
committer android-build-merger <android-build-merger@google.com> 1572474927 -0700

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

Change-Id: I8eec36ffb363954ccf77bde3f7f6a1fc7d7d273e