[automerger] Merge "DO NOT MERGE Disable overlays while installer is resumed" into lmp-dev am: 3f5c440dd1  -s ours am: 7a02fb18ae

Change-Id: I6aa8498deda19847375842806a0fadb8d0207b32