Rename isValidSubId to isValidSubscriptionId. Bug: 18668873 Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44