Merge "Amend typo for DefaultPermissionGrantPolicy" into main am: 381fc97a41 am: d13c118417

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

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