[automerger skipped] Merge "Ignore access from a different user" into main am:...

[automerger skipped] Merge "Ignore access from a different user" into main am: ea0c498c am: 5f561f0d -s ours

am skip reason: Merged-In I2ae7f506b15133f45f00c24e909f49d56fc23e66 with SHA-1 1aea0e91 is already in history

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



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