Merge "Use the same cropping for outer screen and unfolded vertical hinge" into tm-qpr-dev am: 7622545075 am: 6d9261d520 am: 9ba40322cb am: fb2c11ce8d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21794524

Change-Id: Ibf70c4079b315c71291539a7c6714682706abe42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>