Merge "Allow permission pre-grant files on OEM partition" into main am: 2555260704 am: 80fd018bbc

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

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