[automerger skipped] Merge "Add caller check to com.android.credentials.RESET"...

[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a5 -s ours am: 02a19ec5 -s ours am: 616aecf1 -s ours am: 0abbff1a -s ours am: 7f81d953 -s ours am: 37f92a2b -s ours

am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I4355911bec4070894042f209f18a99d0fb3537b2