Merge changes from topic "am-7f073d4b2cd04cbf8d01da05fb301e11"

* changes:
  [automerger skipped] Merge changes from topic "untrusted-cap" into sc-v2-dev-plus-aosp am: ed8d74bc -s ours am: 04a97965 -s ours am: 4ccc7758 -s ours
  [automerger skipped] [automerged blank] Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE 2p: a451d5ba am: 1b84b233 -s ours am: 9bc939a9 -s ours am: eb384518 -s ours