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

Merge changes from topic "am-fff65bf311764194ac266fe45e89521f" into tm-qpr-dev-plus-aosp am: f7722d88

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



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