Merge changes If05d11a0,Ie67f0141 into main am: 899d043523 am: 6c5cb292bc

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

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