Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into...
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef -s ours
am: d9c81559 -s ours
Change-Id: I9dfff7471440739580e7827cdb4484fad6900048