Merge "[RESTRICT AUTOMERGE] Proto changes to update app upgade CTS" into android11-tests-dev