Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert split bucket app upgrade default to true" into android11-tests-dev am: 60de9363f7 -s ours" into android12-tests-dev