Merge changes from topic "version-bump" am: 469c99c285

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

Change-Id: Id8416443712f3ea9963117bb680833bb34b30de8