Merge "Fix wallpaper showing on AOD" into sc-dev am: 6b9f1a5e2a

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

Change-Id: I37a1df9d10aa9396d6a45716286d81ea80cf5f5c