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

Change-Id: I0e7f9f1297ca3f8a8fd02b7b578905fc38a5b8a9