Merge changes from topic "am-a1464e9329354338abae003b908e7c86" into...

Merge changes from topic "am-a1464e9329354338abae003b908e7c86" into tm-qpr-dev-plus-aosp am: 5faf2ffa -s ours

am skip reason: Merged-In I70ecae6f229567c6031d7dc16181c8ec5fbe60e4 with SHA-1 6b7e2528 is already in history

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



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