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

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



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