Merge "Revert "Remove exception from OverlayConfig zygote method" am: 920105c3 am: b1453492" into rvc-d1-dev-plus-aosp