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: 40a8072f am: 9598335a

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



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