Merge changes from topic "am-e7019a59d5874b8bb1e4497e320c405e" into main am:...

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

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



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