Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours
am: bf1c88f34e -s ours
Change-Id: I75d702680bc6ef22e0f60a3c165cd310bf2bb6cf
This commit is contained in: