[automerger skipped] Merge "Update WallpaperEffectsGeneration api, including...

[automerger skipped] Merge "Update WallpaperEffectsGeneration api, including annotations on data classes and allow the same uid process to call returnCinematicResponse API." into tm-dev am: affee4a5 -s ours am: dd2fe414 -s ours

am skip reason: Merged-In Ie12b570f1e6400ab9e289b882e5821921a609e0a with SHA-1 bb146eff is already in history

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



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