[automerger skipped] Merge "[RESTRICT AUTOMERGE] Proto changes to update app...

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

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1819021

Change-Id: Icac9ce46908ef3867e55cc38d7475c150969b633