Merge changes from topic "am-33f56d00dbd94b47bf758ee6c04926d9" into tm-d1-dev-plus-aosp am: 82a8c177

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



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