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

Change-Id: I642f5f7931b7b09cdb1e6b5967120999fc5e98db