Merge changes Ia815d9d8,I30ce0527 into main am: f1e6d28a32

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

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