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

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



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