Unify simplification passes after high-level optimizations am: ec45c7711c am: 2695037006

Original change: https://android-review.googlesource.com/c/platform/art/+/2419206

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