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

Change-Id: If1fe01a9839c1c59ae02cd3c4cbea665ef6f1f3b