[automerger skipped] Merge "Add implementation for IRK to parcelable...

[automerger skipped] Merge "Add implementation for IRK to parcelable functions." into sc-dev am: 7ec057d0 am: 8ba74400be -s ours

am skip reason: Merged-In I54ac5e5f105d155a2d2fc826bf1f64cf34573ff9 with SHA-1 3478d7a8 is already in history

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

Change-Id: Ife2cefa14785063ada9a47bfedf1f4dc425e9361