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

Merge "Add additional faciliator identifying information" into udc-dev am: 35f07168 am: 22a3ec59 am: 08e8a9bd am: 0f61e7ae

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



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