[automerger skipped] Merge "Keep FLAG_SHOW_WALLPAPER flag on NotificationShade." into sc-v2-dev am: e7831937e7 am: 02c4c404bc -s ours
am skip reason: Merged-In I7876c92331125b00931218d9e5aca164a1ea50d9 with SHA-1 0b55f18928 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16075530
Change-Id: I568f5a31b2d908b8403641633cb4665ea1aecdd5
This commit is contained in: