Merge "Update-ability: Refactor BT alert to remove internal AlertController dependency"
am: 825f3d039c

Change-Id: I46f03630c3287c44522c05a4eec712f64eecbf20