Merge "Add Rename device on Bluetooth screen" into pi-dev
am: 667cbc5846

Change-Id: Ib44bc3f768769dc9089a33543912faf871fafab5