[automerger skipped] Merge "perform local immediate override" into main am:...

[automerger skipped] Merge "perform local immediate override" into main am: bc350c12 am: e5aca701 -s ours

am skip reason: Merged-In If279c8cafb020367203f85695b60dcec4b52b168 with SHA-1 fec50966 is already in history

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



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