Merge "Merge "Disable overlays while installer is resumed" into oc-dev am:...
Merge "Merge "Disable overlays while installer is resumed" into oc-dev am: 2c7430dd am: 586424a3" into oc-dr1-dev-plus-aosp
am: e47e9b37
Change-Id: I8b39f1674d310d63795f8a1175ae3343be2fe482