Merge "Add end-to-end tests for @EnforcePermission" am: cdac5de216 am: 0b79c1e4a8

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

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