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