Merge "Revert "Revert "Remove exception from OverlayConfig zygote method""" into rvc-dev am: 6f0c1bc10e am: 93d48d19b0 am: b8b7277316 am: d6e6dcfb37 am: 8becaff4ad

Change-Id: Idafdf99e83118df54ac3e040d614ad69e54cc078