[automerger skipped] Merge "Cleanup in ExpandableNotificationRowTest" into tm-qpr-dev am: b2dc8d8437 am: cd9cbebcfd -s ours

am skip reason: Merged-In I314a1f6e59f095f8cc6018e3d65bf90bd9cd4a75 with SHA-1 d389823e9f is already in history

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

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