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

Merge changes from topic "am-ced8bdeade924be59d5e71fe020ddae2" into tm-d1-dev-plus-aosp am: 37d5954f

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



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