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

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



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