Merge changes from topic "am-d5b141bd837f45aca7cf5dad94177e7e" into tm-d1-dev-plus-aosp am: 64bcf2bd

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



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