Merge changes Ie017bedf,If29d58fa into main am: 850c53840b

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

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