Merge "Configure rustfmt for preupload hook" am: 3e22bc616b am: e1bda9112f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2055165

Change-Id: I98bb9b374be77b15bc15ccaa3d562b61f8482a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>