Merge changes from topic "auth_credential_pin-tm-qpr-dev" into tm-qpr-dev am:...

Merge changes from topic "auth_credential_pin-tm-qpr-dev" into tm-qpr-dev am: c3910e2e am: e096e5a0

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



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