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

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

Change-Id: I78b93601dd43e1cfba91b6cbda77c00a9dce6f7a