[automerger skipped] Merge "First pass code cleanup of...

[automerger skipped] Merge "First pass code cleanup of NotificationPanelViewController" into tm-qpr-dev am: 3c55195e am: a9cfdbb9 -s ours

am skip reason: Merged-In I858ed418ad52f17cbc7d65346c67fda7f45c52bc with SHA-1 a9ee545f is already in history

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



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