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: 1fea707e

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

Change-Id: Id6917e4c39698da8b46c43b591e64e2962ea35c4