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

Change-Id: I81db081bbc793246ed0e6b7fa2551512c9758ff0