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

Change-Id: Ieb005514a7786e4d7aea613923baab6e05adadfa