[automerger skipped] Merge "Add end-to-end tests for @EnforcePermission" am:...

[automerger skipped] Merge "Add end-to-end tests for @EnforcePermission" am: cdac5de2 am: 0b79c1e4 am: 1db6fa51 am: 641c09a3 am: 11f08829 -s ours

am skip reason: Merged-In I2d14f10333eabc385007216038dc487f83a4d21a with SHA-1 b404eee1 is already in history

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



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