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

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

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



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