Merge "Remove StateProvider from LockIcon" into rvc-dev am: 645fdff0 am: ad1fa686 am: 9d19909f am: 298e6651 Change-Id: I468709c3949f52a093eac73cf0901e4a2122d1f8