[automerger skipped] Merge "Disable btif_gatt_check_encrypted_link." into...

[automerger skipped] Merge "Disable btif_gatt_check_encrypted_link." into tm-qpr-dev am: fd0c04da am: ecd5a2c8 -s ours

am skip reason: Merged-In I5fb3eca8419e79c72d067f3f38e1f952de266646 with SHA-1 1514f4b9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21403959



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