Merge "Remove StateProvider from LockIcon" into rvc-dev am: 645fdff012

Change-Id: Iba92357254d4d3ce6716652863b7329157f545f4