Merge "Fixes blank lock screen wallpaper after change wp from home to both"...

Merge "Fixes blank lock screen wallpaper after change wp from home to both" into udc-dev am: 2d7c7aa6 am: 82451db7 am: f6ce2598

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



Change-Id: Ie9ff1894944de12caddbe9771f01b4e62a48c71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>