Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into mnc-dr-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcbc5
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
tree: cced399b3c58b10bb2199b4d8643ecdc508b8c68
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE