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

Change-Id: If025982b2e61bb7cf32004d720aa9baa00d2763c