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

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

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