Allow short strings for manifest permissions in @EnforcePermission am: 5b91f32be1

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

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