Merge "Expose PinResult and ICC PIN/PUK APIs as SystemApi" am: 2391403601 am: 78fa0b0e6a

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

Change-Id: Ib2f5b536b9a78a70aa6eb3dbb48dbdd7e94a14c2