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

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



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