Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21
am: 429683b469
Change-Id: I4998929bae9f510de4dc5828e136921a033ff98e
This commit is contained in: