Merge changes I3ac40130,I6acce43c into main am: 11d5d6ff74

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

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