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

Change-Id: I666fc47cfc14a12eb8c0333194fa03a94e3a3669