Merge "Update EnforcePermissionFix to set fix name" into main am: 27b6ebe4e1 am: 3e42c58f64 am: d4c164024c

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

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