Merge "Always attempt AU w/ kg dismissal on fp failure" into tm-qpr-dev am: 9b8547a3

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



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