am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout...
am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit 'b80b8bb2':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock