Merge "Added flag to enable subscription manager service through adb"