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

[automerger skipped] Merge "Revert "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade."" into sc-v2-dev am: ae46cf38 am: ef7f80f1 -s ours

am skip reason: Merged-In I768c13d2959fb92d2a5d038df560e1575aea0712 with SHA-1 ad5f9aad is already in history

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

Change-Id: I33ad612754522a5527529b3ef83581c32a9572ea