Merge changes from topics "librustutils-cutils", "librustutils-properties" am: b7964f5b70

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

Change-Id: I428a04bdb64ee743226ddbb9195055b9742271d3