Merge changes Ibd2ad90a,Ifeb615dc into main am: 1e067eff77

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

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