Merge "Remove unused execution paths when formatting" am: 6eb4d64e am: 973318bb

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



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