[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba am: f60bc5a9 am: 9619144b Change-Id: I164001793fe32ef903c430594d93dc800e8c396f