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

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

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



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