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

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

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



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