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

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

Change-Id: I966f41db7056be4452050f4a5a8f512f9974f790