[automerger skipped] Merge "[DO NOT MERGE] Fix broken...

[automerger skipped] Merge "[DO NOT MERGE] Fix broken NotificationPanelViewControllerTest" into sc-v2-dev am: 336c20ea am: 339d9593 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icb5c9c91d56eeb3709fd2963f6b0482b0d1fe8c3