Merge changes from topic "am-963ff62c131244b6ad6cd7098f99feef" into...

Merge changes from topic "am-963ff62c131244b6ad6cd7098f99feef" into tm-qpr-dev-plus-aosp am: d06c807f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18692897



Change-Id: Iea9bd2c30eff0dfb1c59f8c3fc9fb4f7d5fd97f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>