Merge changes from topic "bluetooth-certificate-change" into tm-dev am: 3ed0308046 am: b8a33aaef9 am: 8fff5f40ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17605721 Change-Id: Iebe6891c5c2102e8634114f16bfce0bf76b67aee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: