Merge "Revert "Remove exception from OverlayConfig zygote method" am: 920105c3 am: cec2b7c3 am: b4554e00" into rvc-qpr-dev-plus-aosp