[automerger skipped] Merge changes from topic "trusty-dsu_fix-sc-qpr3" into...

[automerger skipped] Merge changes from topic "trusty-dsu_fix-sc-qpr3" into sc-v2-dev-plus-aosp am: a382c386 -s ours

am skip reason: Merged-In I1d07e7c3d15dc1beba2d340181d1b11a7988f869 with SHA-1 6f890b47 is already in history

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

Change-Id: I5b63bdb5bc816db7dfdb89333565efd82429dfac