Merge changes I838fefec,I6e8a3f28 into main am: 5ec5972f64 am: bfc9789f9e

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

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