Merge "Merge "Assert type of 16-bit value in MultiStateCounter parcelables"...

Merge "Merge "Assert type of 16-bit value in MultiStateCounter parcelables" into udc-dev am: a07255e7 am: 004f1f8d am: 0657fdb5" into udc-qpr-dev-plus-aosp am: 80cf795b

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



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