Merge "Update rustfmt options" am: c416460c13

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1400247

Change-Id: I594ce47309d466f126465880fb6be49df31b8534