Merge changes from topic "cherrypicker-L39600000963568021:N90000001414828271" into main am: a3e0eab2bf

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

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