Merge "Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE"" into udc-dev