Merge changes Ibd2ad90a,Ifeb615dc into main am: 1e067eff77 am: 4fffda9184 am: 5315ba20f4

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

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