Merge "Add trace to generateCrop in wallpaperManagerService" into tm-qpr-dev am: ef177e995f am: b03c1f3bc4

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

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