Merge changes If05d11a0,Ie67f0141 into main am: 899d043523

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

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