[automerger skipped] Merge "[DO NOT MERGE]Fix...

[automerger skipped] Merge "[DO NOT MERGE]Fix AuthCredentialPatternView#onErrorTimeoutFinish() bug" into tm-qpr-dev am: d1de180c am: 6d045c5b -s ours

am skip reason: subject contains skip directive

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



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