[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79 am: 222339b1 Change-Id: I0d02ebbbae5ad4dc0dedb28a5850070bf60419bd