Merge "Fix dev settings crash when no OEM unlock service" am: 44cacaa8f1
am: f6d960ac31

Change-Id: I536daa3948be136524e35e35448df09eaa6ad9da