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

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

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