Merge "Add additional faciliator identifying information" into udc-dev am: 35f07168 am: 058188f7

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



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