Merge "[automerger skipped] Merge "Add caller check to...

Merge "[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a16 am: 1ef5f42b am: f43f129d am: 67f53e24 -s ours am: 01739e12 -s ours am: 3e06e0c1 -s ours am: 76fba21f -s ours" into sc-v2-dev-plus-aosp am: aebae8fa -s ours

am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 6407b20a is already in history

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

Change-Id: I297ac9fbfdcd0c866f6283645c247c35855a5d06