Merge "Migrate THROW_SECURITY_EXCEPTIONS" am: 3724bc6c47 am: e0b1e5c604

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

Change-Id: Ibbbce85b61c4a84696b66ba6f1a21f9ee55a376a