DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 4ffe72dcc8

Change-Id: Ic7b9ef6484df0b57c8f1ee7a483ef3bda05c7cc7