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

Merge "Remove unused execution paths when formatting" am: 6eb4d64e am: 973318bb am: 708d316d am: 7d5d62c4 am: c4fc65f4

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



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