Merge "Fix a security exception breaking notification inflation." into sc-dev...

Merge "Fix a security exception breaking notification inflation." into sc-dev am: f24e216a am: 971675d7 am: b4c233f6

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

Change-Id: I0dd4ca416177d4ed4c84a4b7a2563bd73d4af43a