Merge "Revert "Enforce a default policy on packages without <overlayable>""