Merge changes I4bb716a5,I11f2507f,Idfb46e62 into main am: 761162dbef am: 662cdcc17d

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

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