Merge "Update rustfmt options" am: 936a232dec

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

Change-Id: Ie9547238607cba00481f2e62508903574c1f7dde