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

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

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



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