Merge "Change isRttSupported to use a subscription ID" am: 04eabbf676
am: 72b0785b65

Change-Id: I5eaf9ee4733a9b65ba0b5cf956d445589ccd0afe