Merge "Add zoom support to lock screen wallpaper" into rvc-dev am: b4734d9b...

Merge "Add zoom support to lock screen wallpaper" into rvc-dev am: b4734d9b am: 6e0df937 am: 39567647

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

Change-Id: If1b00bb39e0575e43cc8d5f97ca7c7d2fa43756e