Merge "Cancel & restart auth ripple if already running" into tm-qpr-dev am: 83f6027e

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



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