[automerger skipped] Allow short strings for manifest permissions in...

[automerger skipped] Allow short strings for manifest permissions in @EnforcePermission am: 5b91f32b am: fa8ce651 -s ours

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

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



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