Merge "Fixed permananent failure behaviors" am: 3084175e

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



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