Merge changes from topic "am-e7019a59d5874b8bb1e4497e320c405e" into main am: 499d9fc7

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



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