Merge "Add intdef to subscription info record methods" am: 5ddd0bf68e am: acf465e769 am: de55c1fff9

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

Change-Id: If9003c519ff66d39c6394e2c3d5f6aa00373097a