Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 385e9be34f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: I1c9843d0c2c8c5ec12bf76f8a14be73d0c086b70