Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
am: 4204f1658c

Change-Id: I2621dcbb5b727a5420095223f36d3e6e5784799d