Merge "Ensure notification visibility on stopForeground(false)" into sc-dev am: 2591e466c1

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

Change-Id: I22f9d2141fcc2d286cc8f1206752b27c7cdd1c52