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

Merge changes from topic "am-e5c7d98288414ff388ea1f7758dad018" into tm-d1-dev-plus-aosp am: 7cfd9596 -s ours

am skip reason: Merged-In I35daf9a24f546ae25a78a2d841be39072cdc5641 with SHA-1 ed090a26 is already in history

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



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