Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda
am: aec526f710  -s ours

Change-Id: I383f706dfc0690352c3b4d6358ed1269c15ed8b8