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

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

Change-Id: I7adf642fae1670ccc08833ac1a10ee5ad1c12b86