[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8

Change-Id: I36cca997401a549ed94036dd48efa7ba00d73fd4