Merge "Add metric action for bt rename dialog" into oc-dr1-dev am: 8e1f509b5d
am: 23de6959af

Change-Id: I68b23030c05e9d0949675dc158f8fb7dd8ab6479