Merge "Use enforceCallingOrSelfPermission instead in IMMS" into udc-dev am: e50735dd am: 6bef7934

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



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