[automerger skipped] Merge changes I47a60bd0,Ib777d992,Iba5b9c9e into main am:...

[automerger skipped] Merge changes I47a60bd0,Ib777d992,Iba5b9c9e into main am: 095d9148 am: b2e0cb0e -s ours

am skip reason: Merged-In I47a60bd082356f789cfe636d757341c9ed83347f with SHA-1 b246d740 is already in history

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



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