Merge "Add additional faciliator identifying information" into udc-dev am:...

Merge "Add additional faciliator identifying information" into udc-dev am: 35f07168 am: 008580c6 am: 13a97996 am: fd7a4e2e

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



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