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

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



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