Merge "Fixes theme choice on boot when scheme is not from latest wallpaper."...

Merge "Fixes theme choice on boot when scheme is not from latest wallpaper." into tm-qpr-dev am: 4fd8012b am: 94fbcc50

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



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