Merge changes I04c68e95,I9ab2b654,Ic0104961 into main am: c0857666b7 am: b43e012f2b am: ca63ab9a8a

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

Change-Id: I49bb3085fb85064a49766e06788941c5cb4db16e
Signed-off-by: Automerger Merge Worker <[email protected]>