Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a
-s ours am: dac62d24f4
-s ours
am: 566eea85dc
-s ours
Change-Id: Idb5b70997a0b9808fc57b0f8b2ab6a3d8b19d278
This commit is contained in: