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

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



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