Merge "Fix a security exception breaking notification inflation." into sc-dev am: f24e216a am: 778ff1cc am: 255b59ec

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

Change-Id: Ia1e7cce1749219317dd53db20a951cce856b8fcb