Merge "Fix dev settings crash when no OEM unlock service" am: 44cacaa8f1 am: f6d960ac31
am: 2ac3120a01  -s ours

Change-Id: I6df41d962d18ba21424dc408340f6eaaa239c095