[automerger skipped] Allow short strings for manifest permissions in @EnforcePermission am: 5b91f32be1 am: fa8ce651e4 -s ours am: 658426a6be -s ours

am skip reason: Merged-In Ic01049613316b79123ce2300511efb5fd8143d4c with SHA-1 5b91f32be1 is already in history

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

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