Merge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev
am: 4a51e275db

Change-Id: Ibf1bc449bf63e24ffec1fffc3634d4a4c5e281b8