Merge changes I304a1e98,I28f093d6 into main am: 3f1ed978 am: 51d9bf38 am: 363b0fef

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



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