[automerger skipped] Merge "Expose PinResult and ICC PIN/PUK APIs as...

[automerger skipped] Merge "Expose PinResult and ICC PIN/PUK APIs as SystemApi" am: 23914036 am: 78fa0b0e am: 3eb09ed2 -s ours

am skip reason: Change-Id I9cdc11c49e4ca602cfa1464e5f424c4a96798cfe with SHA-1 23057fc3 is in history

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

Change-Id: I845aaf2e4aa9a1ed912f91bb816554af5c9a88a4