Merge changes I95ebeb36,I37da934b,Ifa4a739c,I3d8e5c72,If6a14c4e into main am: c90540ca1a am: eadf19f00f

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

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