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