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: 827e4073

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



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