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

Change-Id: I87a2ed5ca2819723e5136037498805808a081d91