Merge "Fix notification_policy user_set upgrade error" into sc-v2-dev am: dc5c3bf385

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

Change-Id: Icee153c3f6d7607ae533e9a3c511681eeb9795bb