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

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

Change-Id: Ie345e1560864859770ef994b9fd9595d53325573