Merge "Mark deleteMessageFromIcc() as @UnsupportedAppUsage."