tree eb6e122acc7bee9a24dd1dce91f4a80e4e39f75e
parent 9581bad0f9805b9a650db3464e47f34e11475f88
parent 7ba8b9041edc9e143577157f358d3a7d8ea624cb
author Jakub Pawlowski <jpawlowski@google.com> 1553642082 -0700
committer android-build-merger <android-build-merger@google.com> 1553642082 -0700

[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am: 40e4983cc9 -s ours
am: 7ba8b9041e -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1 2711c1ab45 is in history

Change-Id: I56780086be9ba71ee573956d0991824db7ebba0f