Merge "Lock screen live wallpaper API change CTS tests"