Merge "Add missing validation in data classes" into udc-dev am: eff2a6c2 am: 6aae283d

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



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