Merge "Revert "Revert "Remove exception from OverlayConfig zygote method""" into rvc-dev am: 6f0c1bc1 am: 93d48d19 Change-Id: Iaa791e6ff33bf09cbd20f14249d81793b58b2138