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

Change-Id: Ia33a00d2ff7a99fe729ecbe76434e08a86e12e8a