Merge "Add missing validation in data classes" into udc-dev am: eff2a6c2 am: 8fc72e5d

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



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