Merge changes from topic "am-f9d20036710b4cd3b419009c9487d998" into tm-dev-plus-aosp am: f287e7d6

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



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