Merge "Merge "Revert "Persist implicit overlay configurator actor policy"" into rvc-dev am: 13313007 am: ea84d2e2" into rvc-d1-dev-plus-aosp