Merge changes from topic "full_spec_upgrade_sc" into sc-dev am: 060ba1e6ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/15325373

Change-Id: I302ccb6bc9a450923daf8f06681ee9c7e46ba80d