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

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

Change-Id: I8831ae9c6f974af563c62451851075ba807f4532