Merge "Catch security exceptions in RoR APIs" am: 27dcfb808c am: ffbcac67ab

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

Change-Id: I034655978c746b2e824ab27d68d4fb5316aa1b3b