Merge changes I8cdadbf9,I11aa7bac into main am: 36280faaf1 am: afb59dc1eb

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

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