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

Change-Id: I9f17e8f5f3ffe084567c7be7743cc7b62a4e482d