tree 38fb22b5e764d044e41157f19c94e62f23566d54
parent 6fb230f952cc9cf433a213813004fd9c06467418
parent d8e1347b12462e0d42d049abf5488ca21f928ec7
author Xin Li <delphij@google.com> 1572470374 -0700
committer android-build-merger <android-build-merger@google.com> 1572470374 -0700

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

Change-Id: I2eb4aa81f9a185fe7c8f6c5b8fa09e7965d080ed