[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 461f0b47 -s ours am: 35f2cb15 -s ours am: 75384547 -s ours am: dd59bd44 -s ours am skip reason: subject contains skip directive Change-Id: Ifbda31c8076491dcf7c583ae6b7a12cf4c82a4f0