Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev
am: eb7b039304

Change-Id: Icc808587e11431ba869718732909b65203eca010