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

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



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