Merge changes from topic "am-d284a07f92fe4513862e928425f90707" into tm-d1-dev-plus-aosp am: 200a3af1 am: cf7b2981

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



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