Merge "Bluetooth: make it possible to advertise service solicitation UUID" am: 60ccba0c52 am: 272efa5606 am: a32477e77e

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

Change-Id: I30f2113445c6bc72554351a4187166db8ff5e2c2