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 am: ceb288f00b
am: 5acc268372 -s ours
Change-Id: I2d8425f5da49ba7b1bd451f9ce5e15cfd423b7eb
This commit is contained in: