Merge "LockIcon: update content description when config changes" into oc-dr1-dev
am: f79068637a

Change-Id: I77729cfff5b6b8ceff1fac13640ae586b3ba92fb