Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: d7b96bc64f

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

Change-Id: I5bd4e1cf55d6000fe8e0e06cc1ad7f54d9032761