Revert "Remove exception from OverlayConfig zygote method" am: 920105c3 am: b1453492 am: 12f3b82b Change-Id: Ibc2919b3208591645d294f8c2976ece48022a5e2