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

Change-Id: Ibec9965a2fffb1b745284a34a2fb7adee0dfe6a5