Merge changes from topic "rust-property-bindings" am: 5840ab9829 am: 3138c6e329

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

Change-Id: I672ad59654d09c4a196c246b595c0440e37312dd