[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "cherrypicker-L18900030008374535:N55600030140665819", "cherrypicker-L78800030008299249:N92100030138810027" into main am: 28d627c7 am: 9a0aa782 -s ours

am skip reason: Merged-In I8facda4b02ca5a15646d687933d46e16897b15f8 with SHA-1 09287395 is already in history

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



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