Merge "Add metric constant for oem lock dialog"