Merge changes from topic "refactor-util" am: a3400c0cfa

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

Change-Id: I978643ca90007de802722ace465bf1ecc1610161