Merge "Add type to builder constructor as it is required" into udc-dev am:...

Merge "Add type to builder constructor as it is required" into udc-dev am: fe9247c2 am: f0508af8

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



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