Merge changes I3ac40130,I6acce43c into main am: 11d5d6ff74 am: dc815615bb

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

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