[automerger skipped] Merge "Add implementation for IRK to parcelable functions." into sc-dev am: e0276d9c70 am: 8ba74400be -s ours am: e3b8e909bf -s ours
am skip reason: Merged-In I54ac5e5f105d155a2d2fc826bf1f64cf34573ff9 with SHA-1 60b797bd5c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405284
Change-Id: Icf2f88a6ad7968ca58698b4dedc65650bf7a0c64
This commit is contained in: