[automerger skipped] Remove unnecessary if checks am: 0952e037 am: 4f20fc8f -s ours

am skip reason: Merged-In I8478669747ca291d92b825e205f58add76e9a2a2 with SHA-1 58fb7d61 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20024533



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