[automerger skipped] Merge "Make AppSnippet parcelable" into udc-qpr-dev am: b72b145c72 am: 9bc19acbf0 -s ours

am skip reason: Merged-In I2095b092e1a7b3186ff4cdc4c81effce51377b19 with SHA-1 719d00a979 is already in history

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

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