Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp
am: b91e635fa4

Change-Id: Ic3f3c67dee73dd4b23e47853083e4cbf604564bf