[automerger] Merge "DO NOT MERGE Disable overlays while installer is resumed" into nyc-dev am: ed85c9492b am: 9b211d470b am: 31f0bd351e

Change-Id: Iebe7eca37b83775d1ace465cf71d52f8a672eb00