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

Change-Id: I7dee8ede6b6283452acaf37030059e0cc19b3ae2