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