[automerger skipped] Merge "Add implementation for IRK to parcelable functions." into sc-dev am: e0276d9c70 -s ours am: 4833f3aee4 -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: Idf0248f4086231571476ec05205836b5af93d54d
This commit is contained in: