Merge "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade." into sc-v2-dev am: 837add11c3

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

Change-Id: Ie61022f24886603f9e2523fecab9811601cad402