Merge "Bluetooth: make it possible to advertise Transport Discovery Data" am: e7adf14ea3 am: 4e43b68f20 am: 4e5703d57e am: 4742e2b201

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

Change-Id: Ib4d656dfe4bd3c946a41734162b4cd6ec3346224