[automerger skipped] Merge "Update INTERNET perm state cache to use uids...

[automerger skipped] Merge "Update INTERNET perm state cache to use uids instead of appIds." into rvc-qpr-dev am: 467128ae am: 07ec9b4d -s ours

am skip reason: Change-Id I6f2a60695a519a972c96ec8e053d3be5dc732461 with SHA-1 fa834065 is in history

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

Change-Id: I59fba782e0c42ad7a81f56bcceade457d8f4c75d