tree 5304eaa216318e8a16d69211e9b7f7a1f4a457f5
parent ebdb07b40ee8e20e1e1f5bdeea3387240b1dd41d
parent 1bace984128f31e89891a12e39d877f7aeefd760
author Xin Li <delphij@google.com> 1572471748 -0700
committer android-build-merger <android-build-merger@google.com> 1572471748 -0700

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

Change-Id: I3e77b40027a40b410446dad56ad1b24a1aed440a