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

Change-Id: I1c6519a33ade5cae173c46a1520d95286db13d28