Merge "Revert "Revert "Remove exception from OverlayConfig zygote method""" into rvc-dev am: 6f0c1bc10e am: f2f3c24da2 am: fdc8ef6de7

Change-Id: I1aec6494be98b2b4c6c3685813817bd79f182367