[automerger skipped] Merge "Use AppOp value from local identity cache." into mainline-prod am: 392dde6503 -s ours

am skip reason: Change-Id Idf71a9270af8cce3ab36e5c6628fa9569a19c692 with SHA-1 ce86478b9a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13236818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8f2b1efe16729f368550e2942ca1ece16400f5d