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

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

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



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