Merge changes from topic "revert-1900930-version-bump-TMGXYBHYHZ" am: 145169ac1e

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

Change-Id: I20a17a23ad4911b6d76e2782c4f394890997d32e