Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev am: 6dfafa5d95
am: f66702c930

Change-Id: Iaa8dde8ae93cf895001505e84907dfa60b9079f1