Don't change Add/Xor into Ror for constant 0 am: 148894a451 am: c4974bdb35

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

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