Merge "Do not call RecoverySystem with DPMS lock held" into nyc-mr2-dev am: 85ecba4423
am: bbdd744c21  -s ours

Change-Id: If1118e9a00ee5b1fa9c7d6672bc18e38b68be0f7