Merge "Recommend using fp for auth" into sc-dev am: 28e62c2d am: 91f6bf46 am: 7bbd54c1

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

Change-Id: I98d5efe8b9ef8f9d5636a0eab51e00e35aeb1303