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

Change-Id: Iec59deb3310c76ec7588bc8e21a46106048ec0d4