Merge "Recommend using fp for auth" into sc-dev am: 28e62c2d am: 3c75c707

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

Change-Id: Ifbe9c3001d4cbca190646e6959aeb2489001832d