Merge changes from topic "bluetooth-certificate-change" into tm-dev am: 3ed03080 am: b8a33aae

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



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