[automerger skipped] Merge "Fixed permananent failure behaviors" am:...

[automerger skipped] Merge "Fixed permananent failure behaviors" am: 3084175e am: 96658f37 am: 40cf3c80 -s ours

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

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



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