Merge "Make FRR notification expandable" into udc-qpr-dev am: bccf8fc483

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

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