Merge "Make BluetoothGattCallback.onServiceChanged public" am: 802503736d am: 531993dca1

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

Change-Id: Id069612174a151f39e154b63f4af116f9722dd7c