Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Proto changes to update app upgade CTS" into android11-tests-dev am: cb63c63121 -s ours" into android12-tests-dev