Merge "Slice upsell fail if notifications are disabled" into udc-qpr-dev am: b06d7ba8

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



Change-Id: I9ebf18140574f0b5c4a4bda21e51dcfc5da58008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>