Merge changes from topic "am-7f9e1d236a8144219830346f25fac553" into main am: 0b6e9067 -s ours

am skip reason: Merged-In I62a6b6d729849b79aef093eb3e2e3a16180c99c3 with SHA-1 373cca20 is already in history

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



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