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

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

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