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

Change-Id: I6262012fab30014df890bc503adb2b3e04df7480