[automerger skipped] Fixed permananent failure behaviors am: 27194756 -s ours

am skip reason: Merged-In Ic43100635907153bce9631473c56f1edef187fc4 with SHA-1 f1d7bc6c is already in history

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



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