Merge "AOD: Fix LockIcon click handler" into oc-mr1-dev
am: a528ee13bd

Change-Id: Ic5dddc98fc58abc7c813f58b79df6b2ab38e4f2e