Merge "Revert "Revert "Remove exception from OverlayConfig zygote method""" into rvc-dev am: 6f0c1bc10e am: 93d48d19b0 am: ffc2d1f7f1

Change-Id: I91617219d0ec5e6b80b85237ccfdd9f1aa456066