Merge "Merge "LockIcon: update content description when config changes" into oc-dr1-dev am: f79068637a" into oc-mr1-dev am: 98af408afd
am: 17ac8b4809

Change-Id: Iaf051b2d4dca95309a18e845bc2d8262bca2fa9c