Merge "Assert type of 16-bit value in MultiStateCounter parcelables" into udc-dev am: a07255e7 am: 8ea2d77a

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



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