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

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

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