Merge changes from topic "am-101ab8c296574b6fa95fe50a0dfbd6c6" into...

Merge changes from topic "am-101ab8c296574b6fa95fe50a0dfbd6c6" into tm-d1-dev-plus-aosp am: 12f4ca79

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



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