Merge changes Ie08c9241,I5164b528 into main am: b458f13a2f am: 410c4f18cb

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

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