Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev
am: a4c07d7c09

Change-Id: I5d2cb4923bc6b3e9bdcfbab0e7d4b55d9e312f32