This reverts commit efc3f16b. Reason for revert: Regression in creating auth-bound keys Bug: 73773914 Bug: 67752510 Change-Id: Ic3886ceb3c3c0c4274682ed9f5f2bfbf8fdd71b9 (cherry picked from commit da82e2cb)