Merge "perform local immediate override" into main am: bc350c12

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



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