Merge "Fix an issue with default background" into tm-dev am: a7ac48b1 am: 7ba6ccc2

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



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