Merge "Fix the UI template data parcel reading." into tm-dev am: 2ec2deea...

Merge "Fix the UI template data parcel reading." into tm-dev am: 2ec2deea am: b8b7cf9e am: e9a25f77 am: b588d4c9

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



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