[automerger skipped] Merge "Add CTS tests for subscription grouping related APIs" am: 39c6f02746 am: 287b79dab8
am: 8e94da565c  -s ours

Change-Id: I916d1cd2caaf0cc3864a60fb039c3cce481ceb13