Merge "Auth ripple updates" into sc-dev am: 6ce7011395 am: 47e2fa60c2

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

Change-Id: If7acec9d2ecbbf6aeed69866f057eca4672b4642