Merge "Cleanup in ExpandableNotificationRowTest" into tm-qpr-dev am: b2dc8d8437

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

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