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

Change-Id: I472fb2852dcb6d01bfd84fcccda72ae18a0a4c76