[automerger skipped] Merge "Fixed permananent failure behaviors" into...

[automerger skipped] Merge "Fixed permananent failure behaviors" into tm-qpr-dev am: a6cdf01a -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: I68b9eb5c5449ee77ddd97d5d35778f07a41e1013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>