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

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



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