Merge "Make notification match the mocks." into rvc-dev am: 1d5934de3d am: 55b8d1bd53

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

Change-Id: I2db83f03582ac65a5ab1c6446feb4ddebe9767ec