Merge "Data only device(without FEATURE_TELEPHON_CALLING/IMS) : Add try/catch to handle UnsupportedOperationException" into main