[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "no-more-boot-debug-gki-sc-v2-dev" into sc-v2-dev am: 806d08f6 -s ours am: a728942d -s ours

am skip reason: Merged-In I3161e42b00a93177a1a4cb3b22da2218d294b7a7 with SHA-1 92f08702 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16334680

Change-Id: I085102f263e7847ffd595e308b2863b9aa46da13