Merge "Allow permission pre-grant files on OEM partition" into main am: 25552607

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



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