Merge "DO NOT MERGE Disable overlays while installer is resumed" into lmp-dev
am: 3f5c440dd1  -s ours

Change-Id: I0b49fed1dc1985f4de6b8c9f00cb14d7f71b0cd7