[automerger skipped] Allow short strings for manifest permissions in @EnforcePermission am: 5b91f32be1 am: b6c53e1d0d am: 401e30c22d -s ours

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

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

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