Merge "[RESTRICT AUTOMERGE] Revert split bucket app upgrade default to true" into android11-tests-dev