Snap for 4605948 from d4e983364e86fac4a495d2f4f3f5ac9a63be5ca7 to pi-release

Change-Id: I95a042b4735d9658bb3f0387a58bc09e42f07a11
tree: fa4bd261253582d90412b9392ce7c9f769c6edba
  1. bluetooth/
  2. vndk/