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

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

Change-Id: I4f06dc0b0dc5ae9ba252251f25b7a63cee0909ec