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

Change-Id: Ic6337edf70a55cc4141dfe70e92565cd73b661d1