Merge changes Ia815d9d8,I30ce0527 into main am: f1e6d28a32 am: 3e8c752dd9

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

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