[automerger skipped] Merge "Keep FLAG_SHOW_WALLPAPER flag on...

[automerger skipped] Merge "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade." into sc-v2-dev am: 837add11 am: 8c828a63 -s ours

am skip reason: Merged-In Id13ffbbd2c965e0dcc97effd3faf46fd7a8bb1a5 with SHA-1 5e48aeea is already in history

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

Change-Id: Ie806ecd02257ea707428a6f92d8b22a082fc6edc