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

Change-Id: I6996b906bb2bf055639f78a7ef9cbc4f87e5a883