Merge "Update INTERNET perm state cache to use uids instead of appIds." into rvc-qpr-dev am: 467128aef5

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

Change-Id: I78222391b83a4add8e964340ec08bb8a1306e1c6