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

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

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