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

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

Change-Id: I0aaa79817af5c82497c6e58b874f4bfe6fcf6906