Merge "Add extras parameter to rest of data classes" into udc-dev am: b274394e am: 2d89e172

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



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