Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into...

Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp am: fbfc19b1

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



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